From f1321078fda5c21ba4bd9d399fb9048f28c33f52 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Wed, 4 Jun 2025 04:23:54 +0000 Subject: [PATCH] raspbian-triplet hack to replace arm version in triplet returned by config.guess with the one we want for raspbian. Gbp-Pq: Name raspbian-triplet.patch --- compiler-rt/cmake/base-config-ix.cmake | 5 ++--- llvm/cmake/config.guess.hack | 2 ++ llvm/cmake/modules/GetHostTriple.cmake | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 llvm/cmake/config.guess.hack diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake index 908c8a4027..a2074e9c84 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake @@ -257,10 +257,9 @@ macro(test_targets) if(WIN32) test_target_arch(arm "" "" "") else() - test_target_arch(armv4t "" "-march=armv4t" "-mfloat-abi=soft") + test_target_arch(arm "" "" "-mfloat-abi=soft") + test_target_arch(armhf "" "" "-mfloat-abi=hard") test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft") - test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") - test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") endif() elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "avr") test_target_arch(avr "__AVR__" "--target=avr") diff --git a/llvm/cmake/config.guess.hack b/llvm/cmake/config.guess.hack new file mode 100644 index 0000000000..13b18bf7b5 --- /dev/null +++ b/llvm/cmake/config.guess.hack @@ -0,0 +1,2 @@ +#!/bin/bash -e +$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ diff --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake index 1be13bc01a..c9b870a2e2 100644 --- a/llvm/cmake/modules/GetHostTriple.cmake +++ b/llvm/cmake/modules/GetHostTriple.cmake @@ -45,7 +45,7 @@ function( get_host_triple var ) if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows AND NOT MSYS) message(WARNING "unable to determine host target triple") else() - set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) + set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack) execute_process(COMMAND sh ${config_guess} RESULT_VARIABLE TT_RV OUTPUT_VARIABLE TT_OUT -- 2.30.2